Skip to content

Conversation

matthewjasper
Copy link
Contributor

The error code is not emitted on stage1, so ignore this test there.

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 14, 2018
@varkor
Copy link
Contributor

varkor commented Aug 15, 2018

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Aug 15, 2018

📌 Commit 0e43e6f has been approved by varkor

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 15, 2018
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Aug 15, 2018
Ignore test that fails on stage1

The error code is not emitted on stage1, so ignore this test there.
bors added a commit that referenced this pull request Aug 15, 2018
Rollup of 8 pull requests

Successful merges:

 - #52453 (improve diagnostics for tests with custom return values)
 - #53271 (use ? to simplify `TransitiveRelation.maybe_map`)
 - #53279 (Extend documentation of `rustc_on_unimplemented`)
 - #53342 (fix error for unsized packed struct field)
 - #53344 (Add doc examples for std::alloc::{alloc,alloc_zeroed}.)
 - #53368 (Ignore test that fails on stage1)
 - #53388 (Fix links' color)
 - #53396 (Fix since of Iterator::flatten to be a proper semver)

Failed merges:

r? @ghost
@bors bors merged commit 0e43e6f into rust-lang:master Aug 15, 2018
@matthewjasper matthewjasper deleted the only-stage-2 branch August 15, 2018 22:03
@eddyb
Copy link
Member

eddyb commented Aug 15, 2018

IMO we should try to remove the hacky macros and revert this PR (EDIT: opened as #53412).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants